@@ -726,7 +726,7 @@ def distributor_list(request): |
||
| 726 | 726 |
def member_goods_order(request): |
| 727 | 727 |
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
| 728 | 728 |
admin_id = request.POST.get('admin_id', '')
|
| 729 |
- phone = request.POST.get('phone', '')
|
|
| 729 |
+ query = request.POST.get('query', '')
|
|
| 730 | 730 |
good_type = request.POST.get('good_type', '')
|
| 731 | 731 |
page = request.POST.get('page', 1)
|
| 732 | 732 |
num = request.POST.get('num', 20)
|
@@ -740,7 +740,7 @@ def member_goods_order(request): |
||
| 740 | 740 |
except AdministratorInfo.DoesNotExist: |
| 741 | 741 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 742 | 742 |
|
| 743 |
- orders = GoodsOrderInfo.objects.filter(phone__icontains=phone, status=True).order_by('-created_at')
|
|
| 743 |
+ orders = GoodsOrderInfo.objects.filter(Q(phone__icontains=query) | Q(user_id=query) | Q(title__icontains=query) & Q(status=True)).order_by('-created_at')
|
|
| 744 | 744 |
|
| 745 | 745 |
if good_type: |
| 746 | 746 |
orders = orders.filter(good_type=good_type) |
@@ -216,6 +216,7 @@ def good_exchange(request): |
||
| 216 | 216 |
user_id=user_id, |
| 217 | 217 |
good_id=good_id, |
| 218 | 218 |
good_type=good.good_type, |
| 219 |
+ title=good.title, |
|
| 219 | 220 |
name=name, |
| 220 | 221 |
phone=phone, |
| 221 | 222 |
address=address, |